MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename member in DirectoryReconciler for clarity

This commit is contained in:
Jeffrey Griffin 2018-09-19 10:45:22 -07:00
parent 10575d80ad
commit 1cd0abf415
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/whispersystems/textsecuregcm/storage/DirectoryReconciler.java
View File

@ -59,7 +59,7 @@ public class DirectoryReconciler implements Managed, Runnable {
private static final int CHUNK_SIZE = 1000; private static final int CHUNK_SIZE = 1000;
private static final double JITTER_MAX = 0.20; private static final double JITTER_MAX = 0.20;
private final Accounts readOnlyAccounts; private final Accounts accounts;
private final DirectoryManager directoryManager; private final DirectoryManager directoryManager;
private final DirectoryReconciliationClient reconciliationClient; private final DirectoryReconciliationClient reconciliationClient;
private final DirectoryReconciliationCache reconciliationCache; private final DirectoryReconciliationCache reconciliationCache;
@ -72,8 +72,8 @@ public class DirectoryReconciler implements Managed, Runnable {
public DirectoryReconciler(DirectoryReconciliationClient reconciliationClient, public DirectoryReconciler(DirectoryReconciliationClient reconciliationClient,
DirectoryReconciliationCache reconciliationCache, DirectoryReconciliationCache reconciliationCache,
DirectoryManager directoryManager, DirectoryManager directoryManager,
Accounts readOnlyAccounts) { Accounts accounts) {
this.readOnlyAccounts = readOnlyAccounts; this.accounts = accounts;
this.directoryManager = directoryManager; this.directoryManager = directoryManager;
this.reconciliationClient = reconciliationClient; this.reconciliationClient = reconciliationClient;
this.reconciliationCache = reconciliationCache; this.reconciliationCache = reconciliationCache;
@ -148,7 +148,7 @@ public class DirectoryReconciler implements Managed, Runnable {
return cachedCount.get(); return cachedCount.get();
} }
long count = readOnlyAccounts.getCount(); long count = accounts.getCount();
reconciliationCache.setCachedAccountCount(count); reconciliationCache.setCachedAccountCount(count);
return count; return count;
} }
@ -206,9 +206,9 @@ public class DirectoryReconciler implements Managed, Runnable {
Optional<List<Account>> chunkAccounts; Optional<List<Account>> chunkAccounts;
if (fromNumber.isPresent()) { if (fromNumber.isPresent()) {
chunkAccounts = Optional.fromNullable(readOnlyAccounts.getAllFrom(fromNumber.get(), chunkSize)); chunkAccounts = Optional.fromNullable(accounts.getAllFrom(fromNumber.get(), chunkSize));
} else { } else {
chunkAccounts = Optional.fromNullable(readOnlyAccounts.getAllFrom(chunkSize)); chunkAccounts = Optional.fromNullable(accounts.getAllFrom(chunkSize));
} }
return chunkAccounts.or(Collections::emptyList); return chunkAccounts.or(Collections::emptyList);