Merge changes I29e412b8,I57161c14

* changes:
  Make InvalidRevisionException a static class of CreateBranch
  AccountVisibilityProvider: Remove support for legacy suggest.accounts

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

@@ -19,13 +19,8 @@ import com.google.inject.Inject;
 import com.google.inject.Provider;
 
 import org.eclipse.jgit.lib.Config;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class AccountVisibilityProvider implements Provider<AccountVisibility> {
-  private static final Logger log =
-      LoggerFactory.getLogger(AccountVisibilityProvider.class);
-
   private final AccountVisibility accountVisibility;
 
   @Inject
@@ -33,19 +28,6 @@ public class AccountVisibilityProvider implements Provider<AccountVisibility> {
     AccountVisibility av;
     if (cfg.getString("accounts", null, "visibility") != null) {
       av = cfg.getEnum("accounts", null, "visibility", AccountVisibility.ALL);
-    } else if (cfg.getString("suggest", null, "accounts") != null) {
-      try {
-        av = cfg.getEnum("suggest", null, "accounts", AccountVisibility.ALL);
-        log.warn(String.format(
-            "Using legacy value %s for suggest.accounts;"
-            + " use accounts.visibility=%s instead",
-            av, av));
-      } catch (IllegalArgumentException err) {
-        // If suggest.accounts is a valid boolean, it's a new-style config, and
-        // we should use the default here. Invalid values are caught in
-        // SuggestServiceImpl so we don't worry about them here.
-        av = AccountVisibility.ALL;
-      }
     } else {
       av = AccountVisibility.ALL;
     }

gerrit-server/src/main/java/com/google/gerrit/server/project/CreateBranch.java

@@ -16,7 +16,6 @@ package com.google.gerrit.server.project;
 
 import com.google.common.collect.Iterables;
 import com.google.gerrit.common.ChangeHooks;
-import com.google.gerrit.common.errors.InvalidRevisionException;
 import com.google.gerrit.extensions.api.projects.BranchInfo;
 import com.google.gerrit.extensions.restapi.AuthException;
 import com.google.gerrit.extensions.restapi.BadRequestException;
@@ -253,4 +252,15 @@ public class CreateBranch implements RestModifyView<ProjectResource, Input> {
       throw new InvalidRevisionException();
     }
   }
+
+  /** Error indicating the revision is invalid as supplied. */
+  private static class InvalidRevisionException extends Exception {
+    private static final long serialVersionUID = 1L;
+
+    public static final String MESSAGE = "Invalid Revision";
+
+    public InvalidRevisionException() {
+      super(MESSAGE);
+    }
+  }
 }