Merge "Move the binding of AccountCache outside AccountCacheImpl"
diff --git a/java/com/google/gerrit/httpd/init/WebAppInitializer.java b/java/com/google/gerrit/httpd/init/WebAppInitializer.java
index fe4eb1c..8d7fe67 100644
--- a/java/com/google/gerrit/httpd/init/WebAppInitializer.java
+++ b/java/com/google/gerrit/httpd/init/WebAppInitializer.java
@@ -51,6 +51,7 @@
import com.google.gerrit.server.LibModuleType;
import com.google.gerrit.server.ModuleOverloader;
import com.google.gerrit.server.StartupChecks.StartupChecksModule;
+import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.AccountCacheImpl;
import com.google.gerrit.server.account.AccountDeactivator.AccountDeactivatorModule;
import com.google.gerrit.server.account.InternalAccountDirectory.InternalAccountDirectoryModule;
@@ -310,7 +311,16 @@
modules.add(new SysExecutorModule());
modules.add(new DiffExecutorModule());
modules.add(new MimeUtil2Module());
+
modules.add(cfgInjector.getInstance(AccountCacheImpl.AccountCacheModule.class));
+ modules.add(
+ new AbstractModule() {
+ @Override
+ protected void configure() {
+ bind(AccountCache.class).to(AccountCacheImpl.class);
+ }
+ });
+
modules.add(cfgInjector.getInstance(GerritGlobalModule.class));
modules.add(new GerritApiModule());
modules.add(new ProjectQueryBuilderModule());
diff --git a/java/com/google/gerrit/pgm/Daemon.java b/java/com/google/gerrit/pgm/Daemon.java
index d1307b1..ff00391 100644
--- a/java/com/google/gerrit/pgm/Daemon.java
+++ b/java/com/google/gerrit/pgm/Daemon.java
@@ -60,6 +60,7 @@
import com.google.gerrit.server.LibModuleType;
import com.google.gerrit.server.ModuleOverloader;
import com.google.gerrit.server.StartupChecks.StartupChecksModule;
+import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.AccountCacheImpl;
import com.google.gerrit.server.account.AccountDeactivator.AccountDeactivatorModule;
import com.google.gerrit.server.account.InternalAccountDirectory.InternalAccountDirectoryModule;
@@ -469,7 +470,15 @@
modules.add(new SysExecutorModule());
modules.add(new DiffExecutorModule());
modules.add(new MimeUtil2Module());
+
modules.add(cfgInjector.getInstance(AccountCacheImpl.AccountCacheModule.class));
+ modules.add(
+ new AbstractModule() {
+ @Override
+ protected void configure() {
+ bind(AccountCache.class).to(AccountCacheImpl.class);
+ }
+ });
modules.add(new AccountNoteDbWriteStorageModule());
modules.add(new AccountNoteDbReadStorageModule());
diff --git a/java/com/google/gerrit/pgm/util/BatchProgramModule.java b/java/com/google/gerrit/pgm/util/BatchProgramModule.java
index 55312b1..58abe12 100644
--- a/java/com/google/gerrit/pgm/util/BatchProgramModule.java
+++ b/java/com/google/gerrit/pgm/util/BatchProgramModule.java
@@ -34,6 +34,7 @@
import com.google.gerrit.server.LibModuleLoader;
import com.google.gerrit.server.LibModuleType;
import com.google.gerrit.server.ModuleOverloader;
+import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.AccountCacheImpl;
import com.google.gerrit.server.account.AccountVisibilityProvider;
import com.google.gerrit.server.account.CapabilityCollection;
@@ -229,6 +230,7 @@
bind(WorkInProgressStateChanged.class).toInstance(WorkInProgressStateChanged.DISABLED);
bind(AccountVisibility.class).toProvider(AccountVisibilityProvider.class).in(SINGLETON);
bind(AttentionSetObserver.class).toInstance(AttentionSetObserver.DISABLED);
+ bind(AccountCache.class).to(AccountCacheImpl.class);
ModuleOverloader.override(
modules,
diff --git a/java/com/google/gerrit/server/account/AccountCacheImpl.java b/java/com/google/gerrit/server/account/AccountCacheImpl.java
index 3cddda3..8549409 100644
--- a/java/com/google/gerrit/server/account/AccountCacheImpl.java
+++ b/java/com/google/gerrit/server/account/AccountCacheImpl.java
@@ -67,7 +67,6 @@
.loader(Loader.class);
bind(AccountCacheImpl.class);
- bind(AccountCache.class).to(AccountCacheImpl.class);
}
}
diff --git a/java/com/google/gerrit/testing/InMemoryModule.java b/java/com/google/gerrit/testing/InMemoryModule.java
index fc045a5..9f1e4c5 100644
--- a/java/com/google/gerrit/testing/InMemoryModule.java
+++ b/java/com/google/gerrit/testing/InMemoryModule.java
@@ -47,6 +47,7 @@
import com.google.gerrit.server.PluginUser;
import com.google.gerrit.server.Sequence;
import com.google.gerrit.server.Sequence.LightweightGroups;
+import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.AccountCacheImpl;
import com.google.gerrit.server.account.GroupBackend;
import com.google.gerrit.server.account.storage.notedb.AccountNoteDbReadStorageModule;
@@ -201,6 +202,8 @@
bind(MetricMaker.class).to(DisabledMetricMaker.class);
install(cfgInjector.getInstance(AccountCacheImpl.AccountCacheModule.class));
+ bind(AccountCache.class).to(AccountCacheImpl.class);
+
install(cfgInjector.getInstance(GerritGlobalModule.class));
install(new AccountNoteDbWriteStorageModule());
install(new AccountNoteDbReadStorageModule());
