From 1cd0abf41565616e8e0d345ec28f7e64e143684f Mon Sep 17 00:00:00 2001 From: Jeffrey Griffin Date: Wed, 19 Sep 2018 10:45:22 -0700 Subject: [PATCH] Rename member in DirectoryReconciler for clarity --- .../textsecuregcm/storage/DirectoryReconciler.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/whispersystems/textsecuregcm/storage/DirectoryReconciler.java b/src/main/java/org/whispersystems/textsecuregcm/storage/DirectoryReconciler.java index 4f4c21f2e..87794540e 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/storage/DirectoryReconciler.java +++ b/src/main/java/org/whispersystems/textsecuregcm/storage/DirectoryReconciler.java @@ -59,7 +59,7 @@ public class DirectoryReconciler implements Managed, Runnable { private static final int CHUNK_SIZE = 1000; private static final double JITTER_MAX = 0.20; - private final Accounts readOnlyAccounts; + private final Accounts accounts; private final DirectoryManager directoryManager; private final DirectoryReconciliationClient reconciliationClient; private final DirectoryReconciliationCache reconciliationCache; @@ -72,8 +72,8 @@ public class DirectoryReconciler implements Managed, Runnable { public DirectoryReconciler(DirectoryReconciliationClient reconciliationClient, DirectoryReconciliationCache reconciliationCache, DirectoryManager directoryManager, - Accounts readOnlyAccounts) { - this.readOnlyAccounts = readOnlyAccounts; + Accounts accounts) { + this.accounts = accounts; this.directoryManager = directoryManager; this.reconciliationClient = reconciliationClient; this.reconciliationCache = reconciliationCache; @@ -148,7 +148,7 @@ public class DirectoryReconciler implements Managed, Runnable { return cachedCount.get(); } - long count = readOnlyAccounts.getCount(); + long count = accounts.getCount(); reconciliationCache.setCachedAccountCount(count); return count; } @@ -206,9 +206,9 @@ public class DirectoryReconciler implements Managed, Runnable { Optional> chunkAccounts; if (fromNumber.isPresent()) { - chunkAccounts = Optional.fromNullable(readOnlyAccounts.getAllFrom(fromNumber.get(), chunkSize)); + chunkAccounts = Optional.fromNullable(accounts.getAllFrom(fromNumber.get(), chunkSize)); } else { - chunkAccounts = Optional.fromNullable(readOnlyAccounts.getAllFrom(chunkSize)); + chunkAccounts = Optional.fromNullable(accounts.getAllFrom(chunkSize)); } return chunkAccounts.or(Collections::emptyList);