diff options
author | David Ostrovsky <david@ostrovsky.org> | 2022-05-15 18:31:53 +0200 |
---|---|---|
committer | David Ostrovsky <david.ostrovsky@gmail.com> | 2022-05-16 04:24:48 +0000 |
commit | 31147d32f0946b1746b29faa8daaa95d940f08f1 (patch) | |
tree | 02300cd699247f887ea78e760b314f4e58174688 | |
parent | f9f77bedb46d40126cf1d0d123be90fdc06b79fb (diff) |
InMemoryModule: Add support for index lib module
Release-Notes: skip
Change-Id: Id7ef7a53750c81defa04c2017d07ba9ddf125428
-rw-r--r-- | java/com/google/gerrit/testing/InMemoryModule.java | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/java/com/google/gerrit/testing/InMemoryModule.java b/java/com/google/gerrit/testing/InMemoryModule.java index b9daa13770..86ceb6056d 100644 --- a/java/com/google/gerrit/testing/InMemoryModule.java +++ b/java/com/google/gerrit/testing/InMemoryModule.java @@ -37,6 +37,7 @@ import com.google.gerrit.server.CacheRefreshExecutor; import com.google.gerrit.server.FanOutExecutor; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.GerritPersonIdentProvider; +import com.google.gerrit.server.LibModuleType; import com.google.gerrit.server.PluginUser; import com.google.gerrit.server.api.GerritApiModule; import com.google.gerrit.server.api.PluginApiModule; @@ -243,13 +244,19 @@ public class InMemoryModule extends FactoryModule { bind(AllChangesIndexer.class).toProvider(Providers.of(null)); bind(AllGroupsIndexer.class).toProvider(Providers.of(null)); - String indexTypeCfg = cfg.getString("index", null, "type"); - IndexType indexType = new IndexType(indexTypeCfg != null ? indexTypeCfg : "fake"); - // For custom index types, callers must provide their own module. - if (indexType.isLucene()) { - install(luceneIndexModule()); - } else if (indexType.isFake()) { - install(fakeIndexModule()); + // Index lib module has a higher priority than index type configuration. + String indexModule = + cfg.getString("index", null, "install" + LibModuleType.INDEX_MODULE_TYPE.getConfigKey()); + if (indexModule != null) { + install(indexModule(indexModule)); + } else { + String indexTypeCfg = cfg.getString("index", null, "type"); + IndexType indexType = new IndexType(indexTypeCfg != null ? indexTypeCfg : "fake"); + if (indexType.isLucene()) { + install(luceneIndexModule()); + } else if (indexType.isFake()) { + install(fakeIndexModule()); + } } bind(ServerInformationImpl.class); bind(ServerInformation.class).to(ServerInformationImpl.class); |