opendev/gerrit
Code Issues Proposed changes

Adapt the use of @Inject and @AssistedInject

Browse Source 
This change adapts our use of @Inject and @AssistedInject to be in-line
with what the Guice documentation governs [0, 1].

Specifically, @Inject should be used even if the constructor has
@Assisted parameters as long as it is the only injected constructor in
that class. @AssistedInject should be used if there are multiple
constructors with @Assisted parameters.

[0] https://google.github.io/guice/api-docs/4.1/javadoc/index.html?com/google/inject/assistedinject/FactoryModuleBuilder.html
[1] https://google.github.io/guice/api-docs/4.1/javadoc/com/google/inject/assistedinject/AssistedInject.html

Change-Id: I725df1e294d0758f4c27f8b86ec26c21adeb3d8f
This commit is contained in:
Patrick Hiesel
2017-03-23 09:15:19 +01:00
parent 75a22f5159
commit 2b9574c785
29 changed files with 55 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/api/groups/GroupApiImpl.java
View File

@@ -42,8 +42,8 @@ import com.google.gerrit.server.group.PutName;
import com.google.gerrit.server.group.PutOptions;
import com.google.gerrit.server.group.PutOwner;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
@@ -73,7 +73,7 @@ class GroupApiImpl implements GroupApi {
private final GroupResource rsrc;
private final Index index;
@AssistedInject
@Inject
GroupApiImpl(
GetGroup getGroup,
GetDetail getDetail,

4
gerrit-server/src/main/java/com/google/gerrit/server/api/projects/ChildProjectApiImpl.java
View File

@@ -19,8 +19,8 @@ import com.google.gerrit.extensions.common.ProjectInfo;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.server.project.ChildProjectResource;
import com.google.gerrit.server.project.GetChildProject;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
public class ChildProjectApiImpl implements ChildProjectApi {
interface Factory {
@@ -30,7 +30,7 @@ public class ChildProjectApiImpl implements ChildProjectApi {
private final GetChildProject getChildProject;
private final ChildProjectResource rsrc;
@AssistedInject
@Inject
ChildProjectApiImpl(GetChildProject getChildProject, @Assisted ChildProjectResource rsrc) {
this.getChildProject = getChildProject;
this.rsrc = rsrc;