opendev/gerrit
Code Issues Proposed changes

Merge "Bind all REST endpoints at the same place"

Browse Source
This commit is contained in:
Edwin Kempin
2018-06-06 06:28:18 +00:00
committed by Gerrit Code Review
parent 72fe11f960 d51b41f61f
commit f776f12ca0
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/httpd/init/WebAppInitializer.java
View File

@@ -78,10 +78,8 @@ import com.google.gerrit.server.patch.DiffExecutorModule;
import com.google.gerrit.server.permissions.DefaultPermissionBackendModule;
import com.google.gerrit.server.plugins.PluginGuiceEnvironment;
import com.google.gerrit.server.plugins.PluginModule;
import com.google.gerrit.server.plugins.PluginRestApiModule;
import com.google.gerrit.server.project.DefaultProjectNameLockManager;
import com.google.gerrit.server.restapi.RestApiModule;
import com.google.gerrit.server.restapi.config.RestCacheAdminModule;
import com.google.gerrit.server.schema.DataSourceModule;
import com.google.gerrit.server.schema.DataSourceProvider;
import com.google.gerrit.server.schema.DataSourceType;
@@ -357,10 +355,8 @@ public class WebAppInitializer extends GuiceServletContextListener implements Fi
// with the proper classes (e.g. group backends, custom Prolog
// predicates) and the associated rules ready to be evaluated.
modules.add(new PluginModule());
modules.add(new PluginRestApiModule());
modules.add(new RestApiModule());
modules.add(new RestCacheAdminModule());
modules.add(new GpgModule(config));
modules.add(new StartupChecks.Module());

4
java/com/google/gerrit/pgm/Daemon.java
View File

@@ -89,10 +89,8 @@ import com.google.gerrit.server.patch.DiffExecutorModule;
import com.google.gerrit.server.permissions.DefaultPermissionBackendModule;
import com.google.gerrit.server.plugins.PluginGuiceEnvironment;
import com.google.gerrit.server.plugins.PluginModule;
import com.google.gerrit.server.plugins.PluginRestApiModule;
import com.google.gerrit.server.project.DefaultProjectNameLockManager;
import com.google.gerrit.server.restapi.RestApiModule;
import com.google.gerrit.server.restapi.config.RestCacheAdminModule;
import com.google.gerrit.server.schema.DataSourceProvider;
import com.google.gerrit.server.schema.InMemoryAccountPatchReviewStore;
import com.google.gerrit.server.schema.JdbcAccountPatchReviewStore;
@@ -438,8 +436,6 @@ public class Daemon extends SiteProgram {
}
modules.add(new SignedTokenEmailTokenVerifier.Module());
modules.add(new RestApiModule());
modules.add(new PluginRestApiModule());
modules.add(new RestCacheAdminModule());
modules.add(new GpgModule(config));
modules.add(new StartupChecks.Module());
modules.add(new GerritInstanceNameModule());

4
java/com/google/gerrit/server/restapi/RestApiModule.java
View File

@@ -14,6 +14,8 @@
package com.google.gerrit.server.restapi;
import com.google.gerrit.server.plugins.PluginRestApiModule;
import com.google.gerrit.server.restapi.config.RestCacheAdminModule;
import com.google.inject.AbstractModule;
public class RestApiModule extends AbstractModule {
@@ -23,7 +25,9 @@ public class RestApiModule extends AbstractModule {
install(new com.google.gerrit.server.restapi.account.Module());
install(new com.google.gerrit.server.restapi.change.Module());
install(new com.google.gerrit.server.restapi.config.Module());
install(new RestCacheAdminModule());
install(new com.google.gerrit.server.restapi.group.Module());
install(new PluginRestApiModule());
install(new com.google.gerrit.server.restapi.project.Module());
}
}

2
java/com/google/gerrit/testing/InMemoryModule.java
View File

@@ -76,7 +76,6 @@ import com.google.gerrit.server.notedb.MutableNotesMigration;
import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.server.patch.DiffExecutor;
import com.google.gerrit.server.permissions.DefaultPermissionBackendModule;
import com.google.gerrit.server.plugins.PluginRestApiModule;
import com.google.gerrit.server.plugins.ServerInformationImpl;
import com.google.gerrit.server.project.DefaultProjectNameLockManager;
import com.google.gerrit.server.restapi.RestApiModule;
@@ -268,7 +267,6 @@ public class InMemoryModule extends FactoryModule {
bind(ServerInformationImpl.class);
bind(ServerInformation.class).to(ServerInformationImpl.class);
install(new RestApiModule());
install(new PluginRestApiModule());
install(new DefaultProjectNameLockManager.Module());
}