diff options
author | Luca Milanesio <luca.milanesio@gmail.com> | 2021-11-26 10:45:13 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-11-26 10:45:13 +0000 |
commit | 0bf6b14fbe6d9849bf9100f5d7db05759a95c5a9 (patch) | |
tree | af06b816b09b94e14769b1a8252e3d40cb5e9b67 | |
parent | 3319aa6ef9ad9aca688f883850ea5401e4712367 (diff) | |
parent | 8c7778ecaa3edfec62fdaf51792de706154509d1 (diff) |
Merge "Rename libModule types adding the _TYPE suffix" into stable-3.5
5 files changed, 10 insertions, 8 deletions
diff --git a/java/com/google/gerrit/httpd/init/WebAppInitializer.java b/java/com/google/gerrit/httpd/init/WebAppInitializer.java index 9d5e5d50d5..68cf1b2049 100644 --- a/java/com/google/gerrit/httpd/init/WebAppInitializer.java +++ b/java/com/google/gerrit/httpd/init/WebAppInitializer.java @@ -292,7 +292,7 @@ public class WebAppInitializer extends GuiceServletContextListener implements Fi modules.add(new AuthConfigModule()); return cfgInjector.createChildInjector( ModuleOverloader.override( - modules, LibModuleLoader.loadModules(cfgInjector, LibModuleType.DB_MODULE))); + modules, LibModuleLoader.loadModules(cfgInjector, LibModuleType.DB_MODULE_TYPE))); } private Injector createSysInjector() { @@ -362,7 +362,7 @@ public class WebAppInitializer extends GuiceServletContextListener implements Fi modules.add(new ExternalIdCaseSensitivityMigrator.ExternalIdCaseSensitivityMigratorModule()); return dbInjector.createChildInjector( ModuleOverloader.override( - modules, LibModuleLoader.loadModules(cfgInjector, LibModuleType.SYS_MODULE))); + modules, LibModuleLoader.loadModules(cfgInjector, LibModuleType.SYS_MODULE_TYPE))); } private Module createIndexModule() { diff --git a/java/com/google/gerrit/pgm/Daemon.java b/java/com/google/gerrit/pgm/Daemon.java index ba367acafe..1668018d59 100644 --- a/java/com/google/gerrit/pgm/Daemon.java +++ b/java/com/google/gerrit/pgm/Daemon.java @@ -522,7 +522,8 @@ public class Daemon extends SiteProgram { modules.add(new LocalMergeSuperSetComputationModule()); modules.add(new DefaultProjectNameLockManagerModule()); - List<Module> libModules = LibModuleLoader.loadModules(cfgInjector, LibModuleType.SYS_MODULE); + List<Module> libModules = + LibModuleLoader.loadModules(cfgInjector, LibModuleType.SYS_MODULE_TYPE); libModules.addAll(testSysModules); AuthConfig authConfig = cfgInjector.getInstance(AuthConfig.class); diff --git a/java/com/google/gerrit/pgm/util/BatchProgramModule.java b/java/com/google/gerrit/pgm/util/BatchProgramModule.java index 64eef050a6..9bd3067efe 100644 --- a/java/com/google/gerrit/pgm/util/BatchProgramModule.java +++ b/java/com/google/gerrit/pgm/util/BatchProgramModule.java @@ -214,7 +214,8 @@ public class BatchProgramModule extends FactoryModule { bind(AccountVisibility.class).toProvider(AccountVisibilityProvider.class).in(SINGLETON); ModuleOverloader.override( - modules, LibModuleLoader.loadModules(parentInjector, LibModuleType.SYS_BATCH_MODULE)) + modules, + LibModuleLoader.loadModules(parentInjector, LibModuleType.SYS_BATCH_MODULE_TYPE)) .stream() .forEach(this::install); } diff --git a/java/com/google/gerrit/pgm/util/SiteProgram.java b/java/com/google/gerrit/pgm/util/SiteProgram.java index ed6bce6cd8..ff0b31ed72 100644 --- a/java/com/google/gerrit/pgm/util/SiteProgram.java +++ b/java/com/google/gerrit/pgm/util/SiteProgram.java @@ -137,7 +137,7 @@ public abstract class SiteProgram extends AbstractProgram { return Guice.createInjector( PRODUCTION, ModuleOverloader.override( - modules, LibModuleLoader.loadModules(cfgInjector, LibModuleType.DB_MODULE))); + modules, LibModuleLoader.loadModules(cfgInjector, LibModuleType.DB_MODULE_TYPE))); } catch (CreationException ce) { Message first = ce.getErrorMessages().iterator().next(); Throwable why = first.getCause(); diff --git a/java/com/google/gerrit/server/LibModuleType.java b/java/com/google/gerrit/server/LibModuleType.java index b9cb19679d..4c70ce7bc0 100644 --- a/java/com/google/gerrit/server/LibModuleType.java +++ b/java/com/google/gerrit/server/LibModuleType.java @@ -18,13 +18,13 @@ package com.google.gerrit.server; public enum LibModuleType { /** Module for the sysInjector. */ - SYS_MODULE("Module"), + SYS_MODULE_TYPE("Module"), /** BatchModule for the sysInjector */ - SYS_BATCH_MODULE("BatchModule"), + SYS_BATCH_MODULE_TYPE("BatchModule"), /** Module for the dbInjector. */ - DB_MODULE("DbModule"); + DB_MODULE_TYPE("DbModule"); private final String configKey; |