Upgrade to google-java-format 1.5

Change-Id: Ibad33f7aff0226fa954d44365e2b3ea2e3c6ff8e

gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java

@@ -142,7 +142,8 @@ public class AccountManager {
             ExternalId.Key key = ExternalId.Key.create(SCHEME_USERNAME, who.getUserName());
             ExternalId existingId = externalIds.get(key);
             if (existingId != null) {
-              // An inconsistency is detected in the database, having a record for scheme "username:"
+              // An inconsistency is detected in the database, having a record for scheme
+              // "username:"
               // but no record for scheme "gerrit:". Try to recover by linking
               // "gerrit:" identity to the existing account.
               log.warn(

gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestChangeReviewers.java

@@ -86,7 +86,8 @@ public class SuggestChangeReviewers extends SuggestReviewers
   private VisibilityControl getVisibility(ChangeResource rsrc) {
     // Use the destination reference, not the change, as drafts may deny
     // anyone who is not already a reviewer.
-    // TODO(hiesel) Replace this with a check on the change resource once support for drafts was removed
+    // TODO(hiesel) Replace this with a check on the change resource once support for drafts was
+    // removed
     PermissionBackend.ForRef perm = permissionBackend.user(self).ref(rsrc.getChange().getDest());
     return new VisibilityControl() {
       @Override

gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java

@@ -41,7 +41,8 @@ class MySql extends BaseDataSourceType {
     b.append(port(dbs.optional("port")));
     b.append("/");
     b.append(dbs.required("database"));
-    // See https://stackoverflow.com/questions/42084633/table-name-pattern-can-not-be-null-or-empty-in-java
+    // See
+    // https://stackoverflow.com/questions/42084633/table-name-pattern-can-not-be-null-or-empty-in-java
     b.append("?nullNamePatternMatchesAll=true");
     return b.toString();
   }

gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_105.java

@@ -66,7 +66,8 @@ public class Schema_105 extends SchemaVersion {
   private Set<String> listChangesIndexes(JdbcSchema schema) throws SQLException {
     // List of all changes indexes ever created or dropped, found with the
     // following command:
-    //   find g* -name \*.sql | xargs git log -i -p -S' index changes_' | grep -io ' index changes_\w*' | cut -d' ' -f3 | tr A-Z a-z | sort -u
+    //   find g* -name \*.sql | xargs git log -i -p -S' index changes_' | grep -io ' index
+    // changes_\w*' | cut -d' ' -f3 | tr A-Z a-z | sort -u
     // Used rather than listIndexes as we're not sure whether it might include
     // primary key indexes.
     Set<String> allChanges =

gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java

@@ -66,8 +66,7 @@ public class SetLoggingLevelCommand extends SshCommand {
       reset();
     } else {
       for (Enumeration<Logger> logger = LogManager.getCurrentLoggers();
-          logger.hasMoreElements();
+          logger.hasMoreElements(); ) {
-          ) {
         Logger log = logger.nextElement();
         if (name == null || log.getName().contains(name)) {
           log.setLevel(Level.toLevel(level.name()));

tools/setup_gjf.sh

@@ -17,7 +17,7 @@
 set -eu
 
 # Keep this version in sync with dev-contributing.txt.
-VERSION=${1:-1.3}
+VERSION=${1:-1.5}
 
 case "$VERSION" in
 1.3)