opendev/gerrit
Code Issues Proposed changes

Make RestApiModule inherit FactoryModule

Browse Source 
This saves some typing in modules that need to do both things.

Change-Id: If5f343cc7081a39a23707e4f60eed60d04b8966d
This commit is contained in:
Dave Borowitz
2015-08-26 11:16:22 -04:00
parent cb2845b4f8
commit 3a34d3be6c
5 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RestApiModule.java
View File

@@ -16,14 +16,14 @@ package com.google.gerrit.extensions.restapi;
import com.google.gerrit.extensions.annotations.Export; import com.google.gerrit.extensions.annotations.Export;
import com.google.gerrit.extensions.annotations.Exports; import com.google.gerrit.extensions.annotations.Exports;
import com.google.inject.AbstractModule; import com.google.gerrit.extensions.config.FactoryModule;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.TypeLiteral; import com.google.inject.TypeLiteral;
import com.google.inject.binder.LinkedBindingBuilder; import com.google.inject.binder.LinkedBindingBuilder;
import com.google.inject.binder.ScopedBindingBuilder; import com.google.inject.binder.ScopedBindingBuilder;
/** Guice DSL for binding {@link RestView} implementations. */ /** Guice DSL for binding {@link RestView} implementations. */
public abstract class RestApiModule extends AbstractModule { public abstract class RestApiModule extends FactoryModule {
protected static final String GET = "GET"; protected static final String GET = "GET";
protected static final String PUT = "PUT"; protected static final String PUT = "PUT";
protected static final String DELETE = "DELETE"; protected static final String DELETE = "DELETE";

5
gerrit-server/src/main/java/com/google/gerrit/server/account/Module.java
View File

@@ -23,7 +23,6 @@ import static com.google.gerrit.server.account.AccountResource.STARRED_CHANGE_KI
import com.google.gerrit.extensions.registration.DynamicMap; import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.gerrit.extensions.restapi.RestApiModule; import com.google.gerrit.extensions.restapi.RestApiModule;
import com.google.inject.assistedinject.FactoryModuleBuilder;
public class Module extends RestApiModule { public class Module extends RestApiModule {
@Override @Override
@@ -85,7 +84,7 @@ public class Module extends RestApiModule {
delete(STARRED_CHANGE_KIND).to(StarredChanges.Delete.class); delete(STARRED_CHANGE_KIND).to(StarredChanges.Delete.class);
bind(StarredChanges.Create.class); bind(StarredChanges.Create.class);
install(new FactoryModuleBuilder().build(CreateAccount.Factory.class)); factory(CreateAccount.Factory.class);
install(new FactoryModuleBuilder().build(CreateEmail.Factory.class)); factory(CreateEmail.Factory.class);
} }
} }

20
gerrit-server/src/main/java/com/google/gerrit/server/change/Module.java
View File

@@ -22,7 +22,6 @@ import static com.google.gerrit.server.change.FileResource.FILE_KIND;
import static com.google.gerrit.server.change.ReviewerResource.REVIEWER_KIND; import static com.google.gerrit.server.change.ReviewerResource.REVIEWER_KIND;
import static com.google.gerrit.server.change.RevisionResource.REVISION_KIND; import static com.google.gerrit.server.change.RevisionResource.REVISION_KIND;
import com.google.gerrit.extensions.config.FactoryModule;
import com.google.gerrit.extensions.registration.DynamicMap; import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.gerrit.extensions.restapi.RestApiModule; import com.google.gerrit.extensions.restapi.RestApiModule;
import com.google.gerrit.server.account.AccountLoader; import com.google.gerrit.server.account.AccountLoader;
@@ -119,17 +118,12 @@ public class Module extends RestApiModule {
get(CHANGE_EDIT_KIND, "/").to(ChangeEdits.Get.class); get(CHANGE_EDIT_KIND, "/").to(ChangeEdits.Get.class);
get(CHANGE_EDIT_KIND, "meta").to(ChangeEdits.GetMeta.class); get(CHANGE_EDIT_KIND, "meta").to(ChangeEdits.GetMeta.class);
install(new FactoryModule() { factory(ReviewerResource.Factory.class);
@Override factory(AccountLoader.Factory.class);
protected void configure() { factory(EmailReviewComments.Factory.class);
factory(ReviewerResource.Factory.class); factory(ChangeInserter.Factory.class);
factory(AccountLoader.Factory.class); factory(PatchSetInserter.Factory.class);
factory(EmailReviewComments.Factory.class); factory(ChangeEdits.Create.Factory.class);
factory(ChangeInserter.Factory.class); factory(ChangeEdits.DeleteFile.Factory.class);
factory(PatchSetInserter.Factory.class);
factory(ChangeEdits.Create.Factory.class);
factory(ChangeEdits.DeleteFile.Factory.class);
}
});
} }
} }

3
gerrit-server/src/main/java/com/google/gerrit/server/group/Module.java
View File

@@ -26,7 +26,6 @@ import com.google.gerrit.server.group.AddIncludedGroups.UpdateIncludedGroup;
import com.google.gerrit.server.group.AddMembers.UpdateMember; import com.google.gerrit.server.group.AddMembers.UpdateMember;
import com.google.gerrit.server.group.DeleteIncludedGroups.DeleteIncludedGroup; import com.google.gerrit.server.group.DeleteIncludedGroups.DeleteIncludedGroup;
import com.google.gerrit.server.group.DeleteMembers.DeleteMember; import com.google.gerrit.server.group.DeleteMembers.DeleteMember;
import com.google.inject.assistedinject.FactoryModuleBuilder;
public class Module extends RestApiModule { public class Module extends RestApiModule {
@Override @Override
@@ -67,7 +66,7 @@ public class Module extends RestApiModule {
put(INCLUDED_GROUP_KIND).to(UpdateIncludedGroup.class); put(INCLUDED_GROUP_KIND).to(UpdateIncludedGroup.class);
delete(INCLUDED_GROUP_KIND).to(DeleteIncludedGroup.class); delete(INCLUDED_GROUP_KIND).to(DeleteIncludedGroup.class);
install(new FactoryModuleBuilder().build(CreateGroup.Factory.class)); factory(CreateGroup.Factory.class);
DynamicSet.bind(binder(), GroupMemberAuditListener.class).to( DynamicSet.bind(binder(), GroupMemberAuditListener.class).to(
DbGroupMemberAuditListener.class); DbGroupMemberAuditListener.class);

5
gerrit-server/src/main/java/com/google/gerrit/server/project/Module.java
View File

@@ -24,7 +24,6 @@ import static com.google.gerrit.server.project.TagResource.TAG_KIND;
import com.google.gerrit.extensions.registration.DynamicMap; import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.gerrit.extensions.restapi.RestApiModule; import com.google.gerrit.extensions.restapi.RestApiModule;
import com.google.inject.assistedinject.FactoryModuleBuilder;
public class Module extends RestApiModule { public class Module extends RestApiModule {
@Override @Override
@@ -65,7 +64,7 @@ public class Module extends RestApiModule {
get(BRANCH_KIND).to(GetBranch.class); get(BRANCH_KIND).to(GetBranch.class);
delete(BRANCH_KIND).to(DeleteBranch.class); delete(BRANCH_KIND).to(DeleteBranch.class);
post(PROJECT_KIND, "branches:delete").to(DeleteBranches.class); post(PROJECT_KIND, "branches:delete").to(DeleteBranches.class);
install(new FactoryModuleBuilder().build(CreateBranch.Factory.class)); factory(CreateBranch.Factory.class);
get(BRANCH_KIND, "reflog").to(GetReflog.class); get(BRANCH_KIND, "reflog").to(GetReflog.class);
child(BRANCH_KIND, "files").to(FilesCollection.class); child(BRANCH_KIND, "files").to(FilesCollection.class);
get(FILE_KIND, "content").to(GetContent.class); get(FILE_KIND, "content").to(GetContent.class);
@@ -81,7 +80,7 @@ public class Module extends RestApiModule {
get(DASHBOARD_KIND).to(GetDashboard.class); get(DASHBOARD_KIND).to(GetDashboard.class);
put(DASHBOARD_KIND).to(SetDashboard.class); put(DASHBOARD_KIND).to(SetDashboard.class);
delete(DASHBOARD_KIND).to(DeleteDashboard.class); delete(DASHBOARD_KIND).to(DeleteDashboard.class);
install(new FactoryModuleBuilder().build(CreateProject.Factory.class)); factory(CreateProject.Factory.class);
get(PROJECT_KIND, "config").to(GetConfig.class); get(PROJECT_KIND, "config").to(GetConfig.class);
put(PROJECT_KIND, "config").to(PutConfig.class); put(PROJECT_KIND, "config").to(PutConfig.class);