From e7077b8820214d81d12bbd1f6eff97d3ff607c48 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Tue, 15 May 2018 09:13:56 +0200 Subject: [PATCH] Bind the REST API in an own module This is a preparation to move the bindings for the REST API out of GerritGlobalModule so that at Google we can replace them with custom bindings. Change-Id: I36b24206375ee0db4f14e8d50de7cd2721236747 Signed-off-by: Edwin Kempin --- .../server/config/GerritGlobalModule.java | 8 ++--- .../gerrit/server/restapi/RestApiModule.java | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 java/com/google/gerrit/server/restapi/RestApiModule.java diff --git a/java/com/google/gerrit/server/config/GerritGlobalModule.java b/java/com/google/gerrit/server/config/GerritGlobalModule.java index ddc85aee47..45b9b2f6e7 100644 --- a/java/com/google/gerrit/server/config/GerritGlobalModule.java +++ b/java/com/google/gerrit/server/config/GerritGlobalModule.java @@ -169,6 +169,7 @@ import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeQueryBuilder; import com.google.gerrit.server.query.change.ChangeQueryProcessor; import com.google.gerrit.server.query.change.ConflictsCacheImpl; +import com.google.gerrit.server.restapi.RestApiModule; import com.google.gerrit.server.restapi.change.SuggestReviewers; import com.google.gerrit.server.restapi.group.GroupModule; import com.google.gerrit.server.rules.DefaultSubmitRule; @@ -305,12 +306,7 @@ public class GerritGlobalModule extends FactoryModule { install(new AuditModule()); bind(UiActions.class); - install(new com.google.gerrit.server.restapi.access.Module()); - install(new com.google.gerrit.server.restapi.config.Module()); - install(new com.google.gerrit.server.restapi.change.Module()); - install(new com.google.gerrit.server.restapi.account.Module()); - install(new com.google.gerrit.server.restapi.project.Module()); - install(new com.google.gerrit.server.restapi.group.Module()); + install(new RestApiModule()); bind(GitReferenceUpdated.class); DynamicMap.mapOf(binder(), new TypeLiteral>() {}); diff --git a/java/com/google/gerrit/server/restapi/RestApiModule.java b/java/com/google/gerrit/server/restapi/RestApiModule.java new file mode 100644 index 0000000000..1ba6f228f3 --- /dev/null +++ b/java/com/google/gerrit/server/restapi/RestApiModule.java @@ -0,0 +1,29 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.server.restapi; + +import com.google.inject.AbstractModule; + +public class RestApiModule extends AbstractModule { + @Override + protected void configure() { + install(new com.google.gerrit.server.restapi.access.Module()); + 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 com.google.gerrit.server.restapi.group.Module()); + install(new com.google.gerrit.server.restapi.project.Module()); + } +}