Remove @Inject from IndexCollection constructor
Ever since da0459d20ccf1c6e3b35ad36e989b3980fcf2a89 (Extract interfaces
for Index and IndexCollection, 2016-03-15), this is an abstract class so
annotating its constructor has no effect.
Annotate the constructors of its concrete subclasses instead.
Change-Id: I7eecdd794f26ebd34041f829617a25536161dc86
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexCollection.java
index 669e253..ca0fab2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexCollection.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexCollection.java
@@ -14,10 +14,8 @@
package com.google.gerrit.server.index;
-import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
import com.google.gerrit.extensions.events.LifecycleListener;
-import com.google.inject.Inject;
import java.util.Collection;
import java.util.Collections;
@@ -30,9 +28,7 @@
private final CopyOnWriteArrayList<I> writeIndexes;
private final AtomicReference<I> searchIndex;
- @Inject
- @VisibleForTesting
- public IndexCollection() {
+ protected IndexCollection() {
this.writeIndexes = Lists.newCopyOnWriteArrayList();
this.searchIndex = new AtomicReference<>();
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexCollection.java
index 9f4cca8..6aa516c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexCollection.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexCollection.java
@@ -14,12 +14,18 @@
package com.google.gerrit.server.index.account;
+import com.google.common.annotations.VisibleForTesting;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.server.account.AccountState;
import com.google.gerrit.server.index.IndexCollection;
+import com.google.inject.Inject;
import com.google.inject.Singleton;
@Singleton
public class AccountIndexCollection extends
IndexCollection<Account.Id, AccountState, AccountIndex> {
+ @Inject
+ @VisibleForTesting
+ public AccountIndexCollection() {
+ }
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexCollection.java
index 247aa62..dc1c4a5 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexCollection.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexCollection.java
@@ -14,12 +14,18 @@
package com.google.gerrit.server.index.change;
+import com.google.common.annotations.VisibleForTesting;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.server.index.IndexCollection;
import com.google.gerrit.server.query.change.ChangeData;
+import com.google.inject.Inject;
import com.google.inject.Singleton;
@Singleton
public class ChangeIndexCollection extends
IndexCollection<Change.Id, ChangeData, ChangeIndex> {
+ @Inject
+ @VisibleForTesting
+ public ChangeIndexCollection() {
+ }
}
