Accounts: Add method to get all accounts
Having this method allows us to implement loading all accounts from
NoteDb later.
Change-Id: Ifc1d1113f0687ae599a7cbad56cd50ae1c9a3608
Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/Accounts.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/Accounts.java
index 4c23745..e4a2b6b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/Accounts.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/Accounts.java
@@ -50,6 +50,15 @@
}
/**
+ * Returns all accounts.
+ *
+ * @return all accounts
+ */
+ public List<Account> all(ReviewDb db) throws OrmException {
+ return db.accounts().all().toList();
+ }
+
+ /**
* Returns all account IDs.
*
* @return all account IDs
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsConsistencyChecker.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsConsistencyChecker.java
index 10a1411b..2f3f657 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsConsistencyChecker.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsConsistencyChecker.java
@@ -29,18 +29,21 @@
@Singleton
public class AccountsConsistencyChecker {
private final Provider<ReviewDb> dbProvider;
+ private final Accounts accounts;
private final ExternalIds externalIds;
@Inject
- AccountsConsistencyChecker(Provider<ReviewDb> dbProvider, ExternalIds externalIds) {
+ AccountsConsistencyChecker(
+ Provider<ReviewDb> dbProvider, Accounts accounts, ExternalIds externalIds) {
this.dbProvider = dbProvider;
+ this.accounts = accounts;
this.externalIds = externalIds;
}
public List<ConsistencyProblemInfo> check() throws OrmException, IOException {
List<ConsistencyProblemInfo> problems = new ArrayList<>();
- for (Account account : dbProvider.get().accounts().all()) {
+ for (Account account : accounts.all(dbProvider.get())) {
if (account.getPreferredEmail() != null) {
if (!externalIds
.byAccount(account.getId())
