CreateAccount: Simplify error message when username is invalid

The exception is hardcoded to mention the valid characters of the
username, but doesn't actually match the characters that are allowed
since it doesn't include the '@' character.

To avoid the possibility of this error message becoming even more
out of synch if further characters are allowed, simplify it to only
say that the username is invalid.

Change-Id: I036f1690442cd12f44377f44ae728f6ecb5f1346

2 files changed, 2 insertions, 3 deletions

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java
index f97cb2aa6a..e5ddbbbd87 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java
@@ -870,7 +870,7 @@ public class AccountIT extends AbstractDaemonTest {
         gApi.accounts().create(name);
         fail(String.format("Expected BadRequestException for username [%s]", name));
       } catch (BadRequestException e) {
-        assertThat(e).hasMessageThat().contains("must contain only");
+        assertThat(e).hasMessageThat().isEqualTo(String.format("Invalid username '%s'", name));
       }
     }
   }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateAccount.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateAccount.java
index f384a3502d..e7d699466a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateAccount.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateAccount.java
@@ -112,8 +112,7 @@ public class CreateAccount implements RestModifyView<TopLevelResource, AccountIn
     }
 
     if (!ExternalId.isValidUsername(username)) {
-      throw new BadRequestException(
-          "Username '" + username + "' must contain only letters, numbers, _, - or .");
+      throw new BadRequestException("Invalid username '" + username + "'");
     }
 
     Set<AccountGroup.Id> groups = parseGroups(input.groups);