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-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
View File

@@ -38,9 +38,9 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.ResultSet;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import io.searchbox.client.JestResult;
import io.searchbox.core.Bulk;
import io.searchbox.core.Bulk.Builder;
@@ -76,7 +76,7 @@ public class ElasticAccountIndex extends AbstractElasticIndex<Account.Id, Accoun
private final AccountMapping mapping;
private final Provider<AccountCache> accountCache;
@AssistedInject
@Inject
ElasticAccountIndex(
@GerritServerConfig Config cfg,
SitePaths sitePaths,

4
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java
View File

@@ -54,9 +54,9 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.ResultSet;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import io.searchbox.client.JestResult;
import io.searchbox.core.Bulk;
import io.searchbox.core.Bulk.Builder;
@@ -99,7 +99,7 @@ class ElasticChangeIndex extends AbstractElasticIndex<Change.Id, ChangeData>
private final Provider<ReviewDb> db;
private final ChangeData.Factory changeDataFactory;
@AssistedInject
@Inject
ElasticChangeIndex(
@GerritServerConfig Config cfg,
Provider<ReviewDb> db,

4
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
View File

@@ -35,9 +35,9 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.ResultSet;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import io.searchbox.client.JestResult;
import io.searchbox.core.Bulk;
import io.searchbox.core.Bulk.Builder;
@@ -73,7 +73,7 @@ public class ElasticGroupIndex extends AbstractElasticIndex<AccountGroup.UUID, A
private final GroupMapping mapping;
private final Provider<GroupCache> groupCache;
@AssistedInject
@Inject
ElasticGroupIndex(
@GerritServerConfig Config cfg,
SitePaths sitePaths,