Ensure NotesMigration method calls aren't cached

This will soon no longer be an immutable singleton read at startup, so
we shouldn't store the results of method calls in other singletons'
constructors.

Change-Id: I22ef7111586a84d71413876d451611bc8d93b6c6

gerrit-server/src/main/java/com/google/gerrit/server/Sequences.java

@@ -37,12 +37,8 @@ public class Sequences {
       AllProjectsName allProjects) {
     this.db = db;
     this.migration = migration;
-    if (migration.readChanges()) {
     changeSeq = new RepoSequence(
         repoManager, allProjects, "changes", ReviewDb.FIRST_CHANGE_ID, 100);
-    } else {
-      changeSeq = null;
-    }
   }
 
   @SuppressWarnings("deprecation")

gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java

@@ -122,6 +122,7 @@ public class LocalDiskRepositoryManager implements GitRepositoryManager {
   }
 
   private final Path basePath;
+  private final NotesMigration notesMigration;
   private final Path noteDbPath;
   private final Lock namesUpdateLock;
   private volatile SortedSet<Project.NameKey> names;
@@ -130,17 +131,14 @@ public class LocalDiskRepositoryManager implements GitRepositoryManager {
   LocalDiskRepositoryManager(SitePaths site,
       @GerritServerConfig Config cfg,
       NotesMigration notesMigration) {
+    this.notesMigration = notesMigration;
     basePath = site.resolve(cfg.getString("gerrit", null, "basePath"));
     if (basePath == null) {
       throw new IllegalStateException("gerrit.basePath must be configured");
     }
 
-    if (notesMigration.enabled()) {
     noteDbPath = site.resolve(MoreObjects.firstNonNull(
         cfg.getString("gerrit", null, "noteDbPath"), "notedb"));
-    } else {
-      noteDbPath = null;
-    }
     namesUpdateLock = new ReentrantLock(true /* fair */);
     names = list();
   }
@@ -201,7 +199,7 @@ public class LocalDiskRepositoryManager implements GitRepositoryManager {
   public Repository createRepository(Project.NameKey name)
       throws RepositoryNotFoundException, RepositoryCaseMismatchException {
     Repository repo = createRepository(basePath, name);
-    if (noteDbPath != null && !noteDbPath.equals(basePath)) {
+    if (notesMigration.writeChanges() && !noteDbPath.equals(basePath)) {
       createRepository(noteDbPath, name);
     }
     return repo;
@@ -266,7 +264,7 @@ public class LocalDiskRepositoryManager implements GitRepositoryManager {
   @Override
   public Repository openMetadataRepository(Project.NameKey name)
       throws RepositoryNotFoundException, IOException {
-    checkState(noteDbPath != null, "notedb disabled");
+    checkState(notesMigration.readChanges(), "notedb disabled");
     try {
       return openRepository(noteDbPath, name);
     } catch (RepositoryNotFoundException e) {

gerrit-server/src/main/java/com/google/gerrit/server/schema/NotesMigrationSchemaFactory.java

@@ -24,20 +24,20 @@ import com.google.inject.Singleton;
 @Singleton
 public class NotesMigrationSchemaFactory implements SchemaFactory<ReviewDb> {
   private final SchemaFactory<ReviewDb> delegate;
-  private final boolean disableChangesTables;
+  private final NotesMigration migration;
 
   @Inject
   NotesMigrationSchemaFactory(
       @ReviewDbFactory SchemaFactory<ReviewDb> delegate,
       NotesMigration migration) {
     this.delegate = delegate;
-    disableChangesTables = migration.readChanges();
+    this.migration = migration;
   }
 
   @Override
   public ReviewDb open() throws OrmException {
     ReviewDb db = delegate.open();
-    if (!disableChangesTables) {
+    if (!migration.readChanges()) {
       return db;
     }
     return new DisabledChangesReviewDbWrapper(db);