diff options
author | Aurelien Poscia <aurelien.poscia@sonarsource.com> | 2024-01-16 10:27:05 +0100 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2024-01-16 20:02:43 +0000 |
commit | 47c5a7ba5770f547bd9dc848d93785fba29964a9 (patch) | |
tree | 45926a5fbf9dde6e4ec4b2536a44b5073e3e9c58 /server/sonar-webserver-auth | |
parent | 4242fb2533df340a520ad8c86912155ed8a53c20 (diff) | |
download | sonarqube-47c5a7ba5770f547bd9dc848d93785fba29964a9.tar.gz sonarqube-47c5a7ba5770f547bd9dc848d93785fba29964a9.zip |
SONAR-21114 Remove the version tag from api/v2
Diffstat (limited to 'server/sonar-webserver-auth')
-rw-r--r-- | server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserUpdater.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserUpdater.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserUpdater.java index a2faa63fd9f..206e58fd5a4 100644 --- a/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserUpdater.java +++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserUpdater.java @@ -373,8 +373,7 @@ public class UserUpdater { return true; } - private boolean validateScmAccounts(DbSession dbSession, List<String> scmAccounts, @Nullable String login, @Nullable String email, - @Nullable UserDto existingUser, + private boolean validateScmAccounts(DbSession dbSession, List<String> scmAccounts, @Nullable String login, @Nullable String email, @Nullable UserDto existingUser, List<String> messages) { boolean isValid = true; for (String scmAccount : scmAccounts) { @@ -391,8 +390,7 @@ public class UserUpdater { matchingUsersWithoutExistingUser.add(getNameOrLogin(matchingUser) + " (" + matchingUser.getLogin() + ")"); } if (!matchingUsersWithoutExistingUser.isEmpty()) { - messages.add(format("The scm account '%s' is already used by user(s) : '%s'", scmAccount, - Joiner.on(", ").join(matchingUsersWithoutExistingUser))); + messages.add(format("The scm account '%s' is already used by user(s) : '%s'", scmAccount, Joiner.on(", ").join(matchingUsersWithoutExistingUser))); isValid = false; } } |