Use @Nullable consistently in indexer implementations

Reorder the args in GroupIndexerImpl a bit so that it's the same order
as in AccountIndexerImpl and ProjectIndexerImpl.

Change-Id: Ic7734bbf26030496dee83cbb341bc34f3e2c34ef
Signed-off-by: Edwin Kempin <ekempin@google.com>

java/com/google/gerrit/server/index/account/AccountIndexerImpl.java

@@ -50,8 +50,8 @@ public class AccountIndexerImpl implements AccountIndexer {
   private final StalenessChecker stalenessChecker;
   private final ListeningExecutorService batchExecutor;
   private final boolean autoReindexIfStale;
-  private final AccountIndexCollection indexes;
+  @Nullable private final AccountIndexCollection indexes;
-  private final AccountIndex index;
+  @Nullable private final AccountIndex index;
 
   @AssistedInject
   AccountIndexerImpl(
@@ -77,7 +77,7 @@ public class AccountIndexerImpl implements AccountIndexer {
       StalenessChecker stalenessChecker,
       @IndexExecutor(BATCH) ListeningExecutorService batchExecutor,
       @GerritServerConfig Config config,
-      @Assisted AccountIndex index) {
+      @Assisted @Nullable AccountIndex index) {
     this.byIdCache = byIdCache;
     this.indexedListener = indexedListener;
     this.stalenessChecker = stalenessChecker;

java/com/google/gerrit/server/index/change/ChangeIndexer.java

@@ -21,6 +21,7 @@ import com.google.common.util.concurrent.Atomics;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.gerrit.common.Nullable;
 import com.google.gerrit.extensions.events.ChangeIndexedListener;
 import com.google.gerrit.extensions.registration.DynamicSet;
 import com.google.gerrit.index.Index;
@@ -81,8 +82,8 @@ public class ChangeIndexer {
     return Futures.makeChecked(Futures.allAsList(futures), IndexUtils.MAPPER);
   }
 
-  private final ChangeIndexCollection indexes;
+  @Nullable private final ChangeIndexCollection indexes;
-  private final ChangeIndex index;
+  @Nullable private final ChangeIndex index;
   private final SchemaFactory<ReviewDb> schemaFactory;
   private final NotesMigration notesMigration;
   private final ChangeNotes.Factory changeNotesFactory;

java/com/google/gerrit/server/index/group/GroupIndexerImpl.java

@@ -48,26 +48,26 @@ public class GroupIndexerImpl implements GroupIndexer {
 
   private final GroupCache groupCache;
   private final DynamicSet<GroupIndexedListener> indexedListener;
-  private final GroupIndexCollection indexes;
   private final StalenessChecker stalenessChecker;
-  private final boolean autoReindexIfStale;
-  private final GroupIndex index;
   private final ListeningExecutorService batchExecutor;
+  private final boolean autoReindexIfStale;
+  @Nullable private final GroupIndexCollection indexes;
+  @Nullable private final GroupIndex index;
 
   @AssistedInject
   GroupIndexerImpl(
       GroupCache groupCache,
       DynamicSet<GroupIndexedListener> indexedListener,
       StalenessChecker stalenessChecker,
-      @GerritServerConfig Config config,
       @IndexExecutor(BATCH) ListeningExecutorService batchExecutor,
+      @GerritServerConfig Config config,
       @Assisted GroupIndexCollection indexes) {
     this.groupCache = groupCache;
     this.indexedListener = indexedListener;
-    this.indexes = indexes;
     this.stalenessChecker = stalenessChecker;
-    this.autoReindexIfStale = autoReindexIfStale(config);
     this.batchExecutor = batchExecutor;
+    this.autoReindexIfStale = autoReindexIfStale(config);
+    this.indexes = indexes;
     this.index = null;
   }
 
@@ -76,15 +76,15 @@ public class GroupIndexerImpl implements GroupIndexer {
       GroupCache groupCache,
       DynamicSet<GroupIndexedListener> indexedListener,
       StalenessChecker stalenessChecker,
-      @GerritServerConfig Config config,
       @IndexExecutor(BATCH) ListeningExecutorService batchExecutor,
-      @Assisted GroupIndex index) {
+      @GerritServerConfig Config config,
+      @Assisted @Nullable GroupIndex index) {
     this.groupCache = groupCache;
     this.indexedListener = indexedListener;
-    this.indexes = null;
     this.stalenessChecker = stalenessChecker;
-    this.autoReindexIfStale = autoReindexIfStale(config);
     this.batchExecutor = batchExecutor;
+    this.autoReindexIfStale = autoReindexIfStale(config);
+    this.indexes = null;
     this.index = index;
   }
 

java/com/google/gerrit/server/index/project/ProjectIndexerImpl.java

@@ -37,8 +37,8 @@ public class ProjectIndexerImpl implements ProjectIndexer {
 
   private final ProjectCache projectCache;
   private final DynamicSet<ProjectIndexedListener> indexedListener;
-  private final ProjectIndexCollection indexes;
+  @Nullable private final ProjectIndexCollection indexes;
-  private final ProjectIndex index;
+  @Nullable private final ProjectIndex index;
 
   @AssistedInject
   ProjectIndexerImpl(
@@ -55,7 +55,7 @@ public class ProjectIndexerImpl implements ProjectIndexer {
   ProjectIndexerImpl(
       ProjectCache projectCache,
       DynamicSet<ProjectIndexedListener> indexedListener,
-      @Assisted ProjectIndex index) {
+      @Assisted @Nullable ProjectIndex index) {
     this.projectCache = projectCache;
     this.indexedListener = indexedListener;
     this.indexes = null;